Miscellaneous Fixes

Make sure you backup your data.xml somewhere else before running test on Release.