ALHAMBRA - on at the end of the game

[6AnnSo]

Hello,
I am very happy to play to Alhambra with friends. We are used to playing together and we can continue to play despite the pandemic. however, we noticed 2 differences compared to the rules. this happens at the end of the game:
1. The game ends when there is no more draw pile for the building tiles. However it seems to me that in the rules, the game stops when there is no more drag pile for the building tiles AND that there are less than 4 building tiles available on the game board.
2. When the game ends, the remaining building tiles are allocated to the players who have the most money of the relevant color for each remaining tile. I am not sure that the achievement is done correctly.

[Smeg]

The game ends when a player buys a tile or tiles and the building market can't be fully refilled after their turn.

If there are no tiles left to draw but all four spaces on the building market have a tile each then the game continues. As long as there are four buildings for sale, the game still plays.