Fix bug with improperly streaming data
Clean up GraphicsServices import slightly