3.0-dev update 6

Small fixes