some fixes before deploy