Some updates stolen from cm10.1