First bugs correction on API