Zero to Hero: Bugfixes

Just a couple little fixes