#23: Minor fixes for Picture