Fix up some style and validation errors