Lots of tweaks from wmf-bd808-mbp01.