Cleanup and error fixing due to conflict awhile ago.