Style fixes

Fixing some issues discovered during device testing