#181 Nit fixes