Some more sweet changes