Fixes for OpenLayers & Flamingo