Misc fixes and add configs