Cleaned up mac jdk generics issue