Implement bug fixes after peer code review