[Global] Many (MANY!) minor fixes