Fix x axis

Pulls in the latest changes from C3