Fix build for new control library changes