Fixes due to feedback