fixes from AOKP