Fixed HFS bugs