Fix both override hacks