Updated FG and Java 8 hack work