Minor fixes, version 0.5.4