More fixes

Scratch last commit, had things very backwards