Manual control fixes and some manbus fixes