Minor updates based on last fixes changes