Trying to fix some bugs on deploy