Camera Fixes for Glacier from CM