Small fixs