Fixed issues from previous merge (merge diff left in files)