Numerous fixes to all GenLayers