Fixed: compilations errors