SOmes fixes