Attempt some build fixes