A couple quick fixes for option saving