Fixes that are really long past-due