Bump with more fixes