Fixes of various sorts