Fix for some borked code after my cleanup