Fixes after PR Comment