More Infrastructure Fixes