Fixed problems after merge