minor refinements; remove warnings