Fixup app for production use