Minimalism fixes before branching again