small changes to remove pedanting compiler warnings