Tidy warnings
Quell warnings