Integrated origin/ready/compile-fix