Various changes to be compatible with esolid-base