More fixes due to git errors!