Compilation fix + Camera modification