Some raster and psth fixes