Fixing compiler warnings

part 2