[misc] bunch of fixes