v2.5.2 Various bug fixes