additional fixes for version 0.5.03