Fixed stuff after merge