Fixes for Marathon 0.7

See #1240