Some bug fixing
Bumped versions