Revert "a couple small fixes"

This reverts commit ec8d9a059ab8ea331d30d677009f99f0709ef756.