minor changes, no warnings