More externalization changes and capitalizations corrections