Various tiny improvements
Silicate needs to be tested first
Merge pull request #4313 from RKF45/small

Small