diff --git a/contrib/build.php b/contrib/build.php
index 34cf5a7..4bdc314 100755
--- a/contrib/build.php
+++ b/contrib/build.php
@@ -93,7 +93,7 @@
 -----------------
 
 EOT;
-	passthru('tar cvf ../file.tar --exclude=*coffee -- *', $code);
+	passthru('tar cvf ../file.tar --exclude=*coffee --exclude-vcs -- *', $code);
 	if ($code != 0) exit($code);
 echo <<<EOT
 
@@ -123,7 +123,7 @@
 	file_put_contents('package.xml.old', file_get_contents('package.xml'));
 	file_put_contents('package.xml', preg_replace('~<date>\d{4}-\d{2}-\d{2}</date>~', '<date>'.date('Y-m-d').'</date>', file_get_contents('package.xml')));
 	file_put_contents('package.xml', str_replace('</version>', '</version><!-- git id '.trim(shell_exec('git describe --always')).' -->', file_get_contents('package.xml')));
-	passthru('tar cvf be.bastelstu.chat.tar --exclude=*.old --exclude=file --exclude=template --exclude=acptemplate --exclude=contrib -- *', $code);
+	passthru('tar cvf be.bastelstu.chat.tar --exclude=*.old --exclude=file --exclude-vcs --exclude=template --exclude=acptemplate --exclude=contrib -- *', $code);
 	if (file_exists('package.xml.old')) {
 		file_put_contents('package.xml', file_get_contents('package.xml.old'));
 		unlink('package.xml.old');
diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php
index d5ab880..0770719 100644
--- a/file/lib/page/ChatPage.class.php
+++ b/file/lib/page/ChatPage.class.php
@@ -174,6 +174,10 @@ public function readRoom() {
 		if ($this->roomID === 0) {
 			// no room given
 			if (CHAT_FORCE_ROOM_SELECT) {
+				$this->rooms = array_filter($this->rooms, function ($room) {
+					return $room->canEnter();
+				});
+				
 				return;
 			}
 			else {