Fix 'neil check' warnings