miscelleneous fixes