Cleanup some mistakes