some fixes for 0.8