misc tweak to help hdevtools