Correct some settings code; Apply to plugin version properly