Fix #36 and another Popcorn/Deck syncing issue

(To be pulled after #52.)