Bugs fixed for initial raster support