Fix Errors with Option Window