Fix missing conditional blocks which cannot be evualuated