misc: merge issues and fixes