Fixes before deploy