Minor build adjusts