minor changes to rid warnings