Revert "Small fixes."

This reverts commit 1e20a17fe6dd71aaa9c304a429cac4caab0756bf.
Small fixes.
Small fixes.