Fixes compile errors and modified heading adjust

Fixes n'stuff.