Device settings : Fixes from codina