couple pr

by @Silvia

Silvia