Trying to fix deploy issues