Final bug fixes and production adjustments