Fixed issues that appeared after the merge