Minor checks around ticket #18