diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 555d1ee7c25..59745355c5e 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -91,6 +91,7 @@ class report_aged_receivable(osv.osv):
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ To call the init() method timely
         """
+        if context is None:context = {}
         if not self.called:
             self.init(cr, user)
         self.called = True # To make sure that init doesn't get called multiple times
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7c8410cad7f..6d27eec1e66 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -891,39 +891,41 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
+        
+        <!-- Where is object in py file?-->
 
-        <record id="mrp_production_lot_form_view" model="ir.ui.view">
-            <field name="name">mrp.production.lot.line.form</field>
-            <field name="model">mrp.production.lot.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Production Products">
-                    <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="tracking_id"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_production_lot_tree_view" model="ir.ui.view">
-            <field name="name">mrp.production.lot.line.tree</field>
-            <field name="model">mrp.production.lot.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Production Products Consommation">
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="tracking_id"/>
-                </tree>
-            </field>
-        </record>
+        <!--<record id="mrp_production_lot_form_view" model="ir.ui.view">-->
+        <!--    <field name="name">mrp.production.lot.line.form</field>-->
+        <!--    <field name="model">mrp.production.lot.line</field>-->
+        <!--    <field name="type">form</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <form string="Production Products">-->
+        <!--            <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>-->
+        <!--            <field name="name"/>-->
+        <!--            <field name="product_id"/>-->
+        <!--            <field name="product_qty"/>-->
+        <!--            <field name="product_uom"/>-->
+        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
+        <!--            <field name="product_uos" groups="product.group_uos"/>-->
+        <!--            <field name="tracking_id"/>-->
+        <!--        </form>-->
+        <!--    </field>-->
+        <!--</record>-->
+        <!--<record id="mrp_production_lot_tree_view" model="ir.ui.view">-->
+        <!--    <field name="name">mrp.production.lot.line.tree</field>-->
+        <!--    <field name="model">mrp.production.lot.line</field>-->
+        <!--    <field name="type">tree</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <tree string="Production Products Consommation">-->
+        <!--            <field name="product_id"/>-->
+        <!--            <field name="product_qty"/>-->
+        <!--            <field name="product_uom"/>-->
+        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
+        <!--            <field name="product_uos" groups="product.group_uos"/>-->
+        <!--            <field name="tracking_id"/>-->
+        <!--        </tree>-->
+        <!--    </field>-->
+        <!--</record>-->
 
         <record id="mrp_production_product_form_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.form</field>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index caece7efe8f..8747609f321 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">                    
+                <xpath expr="//page[@string='Configuration']" position="inside">                    
                     <field name="ldaps" nolabel="1" colspan="4">
                         <form string="LDAP Configuration">
                             <field name="ldap_server"/>