Revert "Some small fixes"

This reverts commit 302a8e6b8ebe0e95d666a428c5b076daafc9c17d.