two fixes