Fix FZ/RedLogic conflicts