Some bugfixed