Some production testing and fixes