Contains some fixes useful for FCCSW. Waiting for a patch from M Clemencic to fix all current issues.