Some stuff I forgot to commit ages ago.