More transition stuff that I forgot to commit