Version bump and bugfixes