Merging to live - fixes for FF and image compression