Fixes after PR