Stuff I forgot to commit previously.