Fixing a few casualties of my last merge from master to hardware-tutorials-dev