Fixes for where I broke stuff last commit