Update before last build: many various fixes