Last minor fixes