Bug fixes and version update