Few fixes for this very initial lib