Reduce warnings

Warnings down to 7