Soem fixes.