Made some adjustments to try and fix the mysterious missing gov bug.