Port to Factorio 0.9.6

Changes needed for Factorio 0.9.6