Fixing the remaining Infrastructure Blockers