couple more changes to bring inline with aokp