Fixes a few things I've missed with the last commit