JLF: Some minor changes to adapt to Tiles