Fixes for 2.1
Styling :D
Merge pull request #549 from owdqa/feature/camera2.1_fixing

Fixes for 2.1