Added some forgotten forwardings
Formatting