Fixed issues due to merging branches.