More tweaks to get this thing built