fix some warnings
Merged changes