Fixed problems due to rebase