NTUC wants more tweaks to CPF contributions