fixed issues found by nag package