Minor Fixes#3

ronbak wants to merge 2 commits into

airbnb:masterairbnb/cloud-maker:masterfrom

ronbak:feram-patchesronbak/cloud-maker:feram-patchesCopy head branch name to clipboard