Small fixes. Clean-up.