Build 2

Minor tweaks