Fixes review comments