Fixed errors that were breaking staging