Catch the (hopefully) last few production bugs