Small changes to fix big things