Change guard for core. Improve string lib