Fix issues and improvements from review