Static building criteria fixes