Small picture related fixes