addressed some warnings