Spc

Some minor changes to get the code to compile cleanly under Linux.