fix various forgotten shit