Fixes after Review