Some stuff back in April that I forgot to commit