Minifixes

Lots of recent fixes