Various fixes
Bump versions