Clean up a couple bugs...