eliminated some warnings