Fixed soem issues