Fixed all warnings having to do with choice conflics except for one which has to do with expressions