Various fixes changes