Cleanup and fixes...