Fixes to old things