Correct some glaringly stupid errors...