0.4.3 snapshot 19

More bugfixes