Fix several issues with suffixes. Continue reducing