A couple autoblocks fixes.