minor fixes to pass FXCop