first two fixes