More stuff that I forgot to commit