Random things I forgot to commit earlier.