Fix somes problems