Fixes broken calls. Implements --header.