Working on 5.0.2 bug fixes