Release 2 - minor bug fixes