Fix conditional build