Fixed issues based on feedback