Several fixes for Percolation class