Stuff I forgot to commit during LD