Fix issues based on suggestions