diff --git a/ChangeLog b/ChangeLog
index ac1dcdcb3d..a887d5d08a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-04-25  Dave Peticolas  <dave@krondo.com>
 
+	* src/scm/commodity-utilities.scm: fix fixme
+
+	* src/engine/Group.c (xaccGroupGetAccount): remove pokey warning
+
 	* src/engine/gnc-transaction-xml-v2.c: read & write split action
 	field
 
diff --git a/src/engine/Group.c b/src/engine/Group.c
index 6fd75d92cf..c1dd2a92ef 100644
--- a/src/engine/Group.c
+++ b/src/engine/Group.c
@@ -990,8 +990,6 @@ xaccGroupGetAccount (AccountGroup *grp, int i)
 {
    if (!grp) return NULL;
 
-   PWARN ("try to avoid this function, it's O(accounts)");
-
    return g_list_nth_data (grp->accounts, i);
 }
 
diff --git a/src/scm/commodity-utilities.scm b/src/scm/commodity-utilities.scm
index d0e1f9c369..b0c40c2a63 100644
--- a/src/scm/commodity-utilities.scm
+++ b/src/scm/commodity-utilities.scm
@@ -288,10 +288,8 @@
 		 (gnc:numeric-zero)
 		 (gnc:numeric-mul (gnc:gnc-monetary-amount foreign) 
 				  (cadr pair)
-				  ;; FIXME: the constant 100 here is
-				  ;; not a durable solution --
-				  ;; anyone has a better idea?
-				  100 GNC-RND-ROUND))))
+                                  (gnc:commodity-get-fraction domestic)
+				  GNC-RND-ROUND))))
 	  #f))))
 
 ;; Adds all different commodities in the commodity-collector <foreign>