Small clenaup things.