Lake and DFG top block fixes