Few build related changes