Sodium 2.0.7-alpha

Just some tidy up.