Minor fixes
Removed dependency to log4net