Fix a few issues with full preview