Fixed merge issues from Johns branch -JEuvin