Fixes for some things I screwed up in last commit