Slight arg fixes