tighten up log warnings from last commit