(cleanup) Cleaned up some small issues.