diff --git a/INSTALL.txt b/INSTALL.txt
index c56aacd..305b87e 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,6 +1,6 @@
 Domain Blocks installation instructions:
 1. Enable Domain Blocks
-2. Navigate to Admin->Site Building->Blocks and assign blocks to domains (by default all blocks show up on all domains)
+2. Navigate to Admin->Structure->Blocks and assign blocks to domains (by default all blocks show up on all domains)
 
 Domain Blocks uses domain access grants similar to those in Domain Access module (domain_site and domain_id).
 A user must have set domain access permission to assign blocks to domains.
diff --git a/domain_blocks.install b/domain_blocks.install
index 41ec6e8..b26e33e 100644
--- a/domain_blocks.install
+++ b/domain_blocks.install
@@ -9,13 +9,12 @@
  * Implements hook_install().
  */
 function domain_blocks_install() {
-  // Create database tables
-  // Make all blocks accesible by all sites by default
+  // All existing blocks are accesible by all sites by default
   // Since {block} stores a separate row for each theme a block will appear on,
   // we'll use DISTINCT to make sure we're not getting doubles.
-  $existing_blocks = db_query('SELECT DISTINCT module, delta FROM {block}');
   $existing_blocks = db_select('block', 'b')
     ->fields('b', array('module', 'delta'))
+    ->distinct()
     ->execute()
     ->fetchAll();
   foreach ($existing_blocks as $block) {
@@ -39,7 +38,7 @@ function domain_blocks_schema() {
       'module' => array('type' => 'varchar', 'length' => '64', 'not null' => TRUE, 'default' => ''),
       'delta' => array('type' => 'varchar', 'length' => '32', 'not null' => TRUE, 'default' => '0'),
       'realm' => array('type' => 'varchar', 'length' => '20', 'not null ' => TRUE, 'default' => ''),
-      'domain_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => '0'),
+      'domain_id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
     ),
     'indexes ' => array(
       'domain_id' => array('domain_id'),
@@ -48,4 +47,25 @@ function domain_blocks_schema() {
   );
 
   return $schema;
+}
+
+/**
+ * Updates domain_id field's default value to 0 (int) instead of PHP type string.
+ */
+function domain_blocks_update_7201() {
+  db_drop_index('domain_blocks', 'domain_id');
+  db_drop_index('domain_blocks', 'domain_realm_grant');
+  db_change_field('domain_blocks', 'domain_id', 'domain_id', array(
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0
+    ),
+    array(
+      'indexes' => array(
+        'domain_id' => array('domain_id'),
+        'domain_realm_grant' => array('domain_id', 'realm'),
+      )
+    )
+  );
 }
\ No newline at end of file
diff --git a/domain_blocks.module b/domain_blocks.module
index f0f4e92..202cfc0 100644
--- a/domain_blocks.module
+++ b/domain_blocks.module
@@ -329,6 +329,10 @@ function domain_blocks_domainupdate($op, $domain, $edit = array()) {
   }
 }
 
+/**
+ * Deletes all blocks belonging to a domain.
+ * @param int $domain
+ */
 function _domain_blocks_delete($domain) {
   db_delete('domain_blocks')
     ->condition('domain_id', $domain['domain_id'])