Fix some regressions while removing compat
Removing support for pre API 15, part 2