Marianne sprint

Reinstating old fixes that were somehow overwritten