Fixing compiler warnings

part 3