u8815: tweaks to make me feel better