Runtimefixes

Lots...and lots of runtimefixes.