Fix build on 8 and 9