Fixed gcc warnings
Merged