pre-release patch-up