Slightly more gcj support (it builds!)