Fix some issues for challenge 2