Fix stupid papercuts