[KFSQA-838] Fixed some things pointed out during preliminary review. Should be ready to merge into master.