Permanently enable a few options, fix a few compile errors