Various build related changes