Fixes for version 0.5.03