Fix some nits and fix a broken build post some using tidyup