Upload some fixes