Fix ICS compat issues