[Build] Applied minor updates. Thanks Neo2003