Minor fixes, and use ? markers instead of argX in accessors