I feel obligated to point out that I already posted a functional version of Roy's triggers (the actual triggers themselves) in this thread, which already included those corrections, and the thread creator is already using my triggers with said corrections.

Edit: Also, there is a little problem with your triggers where the player will immediately lose the game if they don't start with buildings.