Revert "Small fixes"

This reverts commit 9012c884c4b83edd446a02d7961278793807b9c9.