More genus fixes

looks like this is getting rather annoying and hard to do fully
automatically...