Last fixes for 1.0.0 version