SPOD fixes

Okay, this is my first commit to fixing all SPOD-related issues that currently are known. This will show the current situation, and we can use Travis to track the progress