Fixing NfsStyleCheck issues