Several changes to the SOIL library