Fixup build + minor changes