Three bugfixes

These three commits fix three bugs that made my life hard when using genss.