silence some warnings 

Mostly just some nitpicky ones, feel free to ignore if there are too many changes here...