Version bump + fixes