Bump up to latest 0.5.x