Fix stuff and bump version