shortener fixes