Misc small fixes v2