Bugfixes for version 0.4.0 release