Some fixes (with clean build)