Some more fixes to WMTSSource