Fixes after JDK 8u74