bugfixes for common header