shellcheck: removed some expr warnings