Fixed some warnings
mergin