Fixed the last remaining exceptions.