3.0-dev1 update 3

General fixes