Fix maestro issues