Changes for production release