Merge fixes... again

InitializeBrain has the confetti again \o/