Fixing some more changes I missed