Fix based on suggestions