fixes for 62X compilation