Misc fixes, useful for DSSIs