API 8 differences extended to support API 7 too (which seems to be compatible)