[jh] general fixes