some fixes before upload