Final fixes before commiting to production