Fix picture bugs