Fixes places which were broken with new params