Better interop with java.  But still not asclean as I'd like