Backwards compatibility fixes for Serrano 2.3.x

These will be removed in the 2.4 release.