Fix for other errors