Last fixes for 1.0