Further picture stream tweaks