Fixed some 0.9.0 problems