--- a/src/JavaLookup.st	Wed Apr 18 09:56:37 2012 +0000
+++ b/src/JavaLookup.st	Sat Apr 21 08:35:04 2012 +0000
@@ -476,10 +476,10 @@
     ProxyMethod installProxies ifTrue:[
         Class withoutUpdatingChangesDo:[
             class addSelector:selector withMethod:proxy.
+            proxy mclass: class.
         ]
     ]
 
-    "Modified: / 23-12-2011 / 13:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 01-01-2012 / 17:41:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
@@ -636,7 +636,7 @@
 
         cls := arg class.
         candidates := candidates select:[:m|
-self breakPoint:#mh.
+            self breakPoint:#mh.
             self type: cls matches: (m descriptor parameters at: index) javaClass
         ].
     ].
@@ -652,12 +652,21 @@
 
     "Created: / 03-01-2012 / 21:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 03-04-2012 / 13:59:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified (format): / 20-04-2012 / 19:58:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 type: actual matches: formal 
     "Return true, if actual (parameter) type matches given formal (parameter) type"
 
-    formal isJavaPrimitiveType ifTrue: [ ^ actual == formal. ].
+    formal isJavaPrimitiveType ifTrue: [ 
+        actual == SmallInteger ifTrue:[
+            ^formal == Integer or:[actual == formal].
+        ].
+        formal == Boolean ifTrue:[
+            ^actual == True or:[actual == False or:[actual == Boolean]].
+        ].
+        ^ actual == formal. 
+    ].
     actual isJavaPrimitiveType ifTrue: [
         ^ formal isJavaWrapperClass and: [ formal javaWrapperClass == actual. ]
     ].
@@ -668,6 +677,7 @@
 
     "Created: / 03-01-2012 / 22:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 03-04-2012 / 13:59:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 20-04-2012 / 20:17:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLookup::Smalltalk2Java methodsFor:'utilities (old)'!