Removed resolved Fixme comment
Updated global headers