AOKP specific fixes