squashed a few type errors