Infrastructure fixes and prepping