Fixed issues introduced by merge