Revert "couple fixes"

This reverts commit ae1fa5a4a2e49e16c9c47008df74caf0cbc922cf.
shshs

d