Bug fixes for 1.0.1 refer to issues milestone