Make fixes for maruku 0.7.0.