Fixed ref params and const methods