A few minor changes. Don't re-disable compatible