Temporarily fix some errors