* Small fixes, doing some cleanup [ci skip]