Added hook for %36, fixed some issues in deploy script