Fixes for @ohadlevy's comments in #7

Sorry for merging fast ;)