Fixing vlc snapshots + other minor changes