Fixed problems due to merge