Fixed breaking tests against 2.5.5, bumped release candidate, minor bug fixes