fixing broken stuff after merge