Fixed issues created by last rebase