Add a few missing OF_UNAVAILABLE