Various fixes for config-less operation