Fix some defaults for public release