Soddd bug fixes