Update to 1.6.5, more reflection fixes