Various

Various changes to reflect hardware changes.