Code style minor fixes; compilation fixes
Annotate all interfaces with @FunctionalInterface