Minor tweaks to classes and build menu