Fixed compile warnings
Merged changes