Work in progress fixes for Mosaic plugin