some fixes for 0.9.3-dev