Fixes from non existing 0.6.1 release