Fixes for version 0.4-6