Bugfixes for 0.5.3 release