Various updates to current production setup