More fixing
Slight fixes
Revert "Slight fixes"

This reverts commit 966649e6fcf2f6fb33c4c260ed5101f74c1931b0.
Revert "More fixing"

This reverts commit a482ba65c9c902e58bf9c45812f9a95234facefd.