Fix loading resources
Review 'make clean'