Small fixes for 1.0