Misc fixes for review feedback