Misc. missing files from previous commit