Append some fixes