D8 formatters and some fixings