Finish fixing 1.8 compat