Lock the Control Time and some fixes