fixes from aokp