minor changes to remove warnings