fixups for cm10.1, oops!