Minor fixes and minor version update