Various runtime configuration fixes