two fixes for 0.4.0