Fix several backwards incompatibilities