Fix zakk's screwups