Fix incomplete patterns and shadowed variable warnings