Clean up smez's fix and other little things