fixes for version 0.9