Fixing some compiler warnings ...