fixed some warnings
merge