0.4.3 snapshot 25

General changes and fixes