Little performance improvements