Revert "Small fixes"

This reverts commit 361a6dd0595b0e71151d3cb471e50d1dbf6acdde.