logic fixes for save polly modes