Minor fixes for graph preview