fixes for minimal working configuration