Added 2 Bugs for Java 8 support in CS and FB