Make applications work with #644