Latest fixes from http://cglib.cvs.sourceforge.net/viewvc/cglib/cglib/src/