Minor fixes and version updates