Fixes to d1 and rpi2 after Alex run through
JTL fixes for d1