Various fixes v2