Fix Tyler's silly bugs