Some basics improvements