Fixed issues casued by merge