Nikhil Murthy's Syphilisation: Minor bugfix

More bugfixes. If you send them to me, I will fix them.