more sweet fixes