Fix setup and match string bugs