fix various silly things