Misc
Add 2 missing files from previous commits