diff --git a/library/coinduction.yap b/library/coinduction.yap
index c85d54c8d..294499b05 100644
--- a/library/coinduction.yap
+++ b/library/coinduction.yap
@@ -1,16 +1,3 @@
-/**
- * @file   coinduction.yap
- * @author VITOR SANTOS COSTA <vsc@VITORs-MBP.lan>, Arvin Bansal,
- *          
- *         
- * @date   Tue Nov 17 14:55:02 2015
- * 
- * @brief  Co-inductive execution
- * 
- * 
-*/
-
-
 /*************************************************************************
 *									 *
 *	 YAP Prolog 							 *
@@ -28,6 +15,20 @@
 *									 *
 *************************************************************************/
 
+/**
+ * @file   coinduction.yap
+ * @author VITOR SANTOS COSTA <vsc@VITORs-MBP.lan>, Arvin Bansal,
+ *
+ *
+ * @date   Tue Nov 17 14:55:02 2015
+ *
+ * @brief  Co-inductive execution
+ *
+ *
+*/
+
+
+
 % :- yap_flag(unknown,error).
 % :- style_check(all).
 
diff --git a/packages/myddas/pl/myddas_driver.ypp b/packages/myddas/pl/myddas_driver.ypp
index 101133bf4..694ec68cb 100644
--- a/packages/myddas/pl/myddas_driver.ypp
+++ b/packages/myddas/pl/myddas_driver.ypp
@@ -21,14 +21,14 @@
 #define NAME() 'YAPsqlite3'
 #define MODULE() myddas_sqlite3
 #define INIT() init_sqlite3
-#elif defined( odbc )
+#elif defined( odbc ) && !defined(ANDROID)
 #undef odbc
 #define DBMS(x) odbc_##x
 #define c_DBMS(x) c_odbc_##x
 #define NAME() 'YAPodbc'
 #define MODULE() myddas_odbc
 #define INIT() init_odbc
-#elif defined( postgres )
+#elif defined( postgres ) && !defined(ANDROID)
 #undef postgres
 #define DBMS(x) postgres_##x
 #define c_DBMS(x) c_postgres_##x
diff --git a/pl/android.yap b/pl/android.yap
index 618a973ba..cee846814 100644
--- a/pl/android.yap
+++ b/pl/android.yap
@@ -8,15 +8,13 @@
 
 text_to_query( MString, Status ) :-
 	strip_module( MString, Mod, String ),
+
+    top_query(query_( MString, Mod, Status ) ).
+
+query_( Mtring, Mod, Status ) :-
   	atomic_to_term( String, Goal, VarNames ),
 	(
 	is_list(Goal) -> G = ensure_loaded( Goal ) ; G = Goal ),
- 	catch(query_to_answer( Mod:G, VarNames, Status, Bindings),
-	      H,error_handler(H,error)
-	     ), 
-	write_query_answer( Bindings ),
-	nl(user_error).
+ 	catch(query_to_answer( Mod:G, VarNames, Status, Bindings).
+
 
-%:- [sqlitest].
-user:file_search_path(data, Home) :-
-    user:file_search_path(library, Home).