fix incompatibilities in Controller extension