[Misc] More build improvements and minor fixes