Minor improvements from testing