Fixed issues in merged code