Fixed express issues