Cleanup and fix for some imports