Bump and fixes