diff --git a/dibi/dibi.php b/dibi/dibi.php
index 8e0a4d17..aa4b0f5c 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -33,26 +33,32 @@ if (version_compare(PHP_VERSION, '5.2.0', '<')) {
  * Compatibility with Nette
  */
 if (!class_exists('NotImplementedException', FALSE)) {
+	/** @package exceptions */
 	class NotImplementedException extends LogicException {}
 }
 
 if (!class_exists('NotSupportedException', FALSE)) {
+	/** @package exceptions */
 	class NotSupportedException extends LogicException {}
 }
 
 if (!class_exists('MemberAccessException', FALSE)) {
+	/** @package exceptions */
 	class MemberAccessException extends LogicException {}
 }
 
 if (!class_exists('InvalidStateException', FALSE)) {
+	/** @package exceptions */
 	class InvalidStateException extends RuntimeException {}
 }
 
 if (!class_exists('IOException', FALSE)) {
+	/** @package exceptions */
 	class IOException extends RuntimeException {}
 }
 
 if (!class_exists('FileNotFoundException', FALSE)) {
+	/** @package exceptions */
 	class FileNotFoundException extends IOException {}
 }
 
@@ -67,7 +73,7 @@ if (!class_exists('DateTime53', FALSE)) {
 
 
 /**
- * Back-compatibility
+ * @deprecated
  */
 class DibiVariable extends DateTime53
 {
diff --git a/dibi/drivers/firebird.php b/dibi/drivers/firebird.php
index bdc1c748..6344f2ba 100644
--- a/dibi/drivers/firebird.php
+++ b/dibi/drivers/firebird.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -25,7 +25,7 @@
  *
  * @author     Tomáš Kraina, Roman Sklenář
  * @copyright  Copyright (c) 2010
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiFirebirdDriver extends DibiObject implements IDibiDriver
 {
@@ -804,7 +804,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver
  *
  * @author     Roman Sklenář
  * @copyright  Copyright (c) 2010
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiProcedureException extends DibiException
 {
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 87a7df1a..8b4b51ef 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -24,7 +24,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiMsSqlDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php
index 2c3b944c..b63dd058 100644
--- a/dibi/drivers/mssql2005.php
+++ b/dibi/drivers/mssql2005.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -22,7 +22,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiMsSql2005Driver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index 992107ad..6400d10c 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -30,7 +30,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiMySqlDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 5520ad82..d90dfee4 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -30,7 +30,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiMySqliDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index eb2444f9..fc5d3133 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -23,7 +23,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiOdbcDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index 1446febd..e7b63e06 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -25,7 +25,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiOracleDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index 285172bf..7e49f4b2 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -23,7 +23,7 @@
  *   - 'lazy' - if TRUE, connection will be established only when required
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiPdoDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index ff310db8..86b2f375 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -24,7 +24,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiPostgreDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 898b83c0..64368d0e 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -26,7 +26,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiSqliteDriver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/drivers/sqlite3.php b/dibi/drivers/sqlite3.php
index c1df80ea..5cde44ca 100644
--- a/dibi/drivers/sqlite3.php
+++ b/dibi/drivers/sqlite3.php
@@ -7,7 +7,7 @@
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @license    http://dibiphp.com/license  dibi license
  * @link       http://dibiphp.com
- * @package    dibi
+ * @package    dibi\drivers
  */
 
 
@@ -24,7 +24,7 @@
  *   - 'resource' - connection resource (optional)
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
- * @package    dibi
+ * @package    dibi\drivers
  */
 class DibiSqlite3Driver extends DibiObject implements IDibiDriver
 {
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index e5def376..b3269e59 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -466,12 +466,3 @@ class DibiFluent extends DibiObject implements IDataSource
 	}
 
 }
-
-
-// PHP < 5.2 compatibility
-if (!function_exists('array_fill_keys')) {
-	function array_fill_keys($keys, $value)
-	{
-		return array_combine($keys, array_fill(0, count($keys), $value));
-	}
-}