Improvements to Many-Sorted Finite Model Finding using SMT Solvers