Fixed: compilation issues