Clean up some setters