diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index 6c07f3d..75436ee 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -121,10 +121,10 @@ gameNavVal_t Game::Run(void) {
 			_playerHealthBar.SetProgress((float)_player->GetHealth() / 100.0f);
 
 			playerExp.str("");
-			playerExp << "Player Level " << _player->GetLevel() <<  "  (" << _player->GetExp() << "/" << Player::EXP_TABLE[_player->GetLevel()] << ")";
+			playerExp << "Player Level " << _player->GetLevel() <<  "  (" << _player->GetExp() << "/" << Player::EXP_TABLE[_player->GetLevel() - 1] << ")";
 			_playerExp.SetTextBlended(playerExp.str(), vsmall, COLOUR_WHITE);
 
-			_playerExpBar.SetProgress((float)_player->GetExp() / (float)Player::EXP_TABLE[_player->GetLevel()]);
+			_playerExpBar.SetProgress((float)_player->GetExp() / (float)Player::EXP_TABLE[_player->GetLevel() - 1]);
 
 			// Check to see if we are allowed to display debug info.
 			if(debugEnabled) {
diff --git a/src/libUnuk/LevelGen/LevelGen.cpp b/src/libUnuk/LevelGen/LevelGen.cpp
index 09a2833..8ff78ee 100644
--- a/src/libUnuk/LevelGen/LevelGen.cpp
+++ b/src/libUnuk/LevelGen/LevelGen.cpp
@@ -269,7 +269,7 @@ findNext:
 }
 
 void LevelGen::GenerateEnemies(void) {
-  int npcsToGen = 4 + (rand() % 4);
+  int npcsToGen = 4 + (rand() % ((_player->GetLevel() * 2) + 4));
   
   for(int i = 0; i < npcsToGen; i++) {
     int spawnX;