Fix all CPU driver errors and conflicts