Fix indentation (2)
Add TODO in order to remove the UTC proxy hack afterwards