Tweaks to initial build