Few more clean up things.