Various fixes, version update