Cleo injection fixes