More Qeros fixes