some fixes for aokp features from aokp