Couple of deferred fixes for older Java compilers