Working on deploy issues