Added fhs and removed fixup.