Minor changes (squash with modal commit)