#27 #28 #29 #30 #31 #32 Clean up errors