fix various issues from updates