Fixup: Make setup changes