Fixes for runtime happiness