Fixed some warnings
merged