Add LockClock and Apollo to all builds