Fix some issues with thumbnail display