Fix few bugs reviewed by Boaz
Re-arranged emails subjet