Nikhil Murthy's Syphilisation: Minor Bugfixes

Just a couple of minor bugfixes in this one.