Bugfixes for Release 0.13

Suggested reviewer: @iliastsi