fixes, misc