Some "No matching signal" errors fixed.