Removed NonBlockingHashMap and fixed one compile error