diff --git a/lib/bourne-shell.sh b/lib/bourne-shell.sh
index 4f2ac109d..c45e2f88f 100644
--- a/lib/bourne-shell.sh
+++ b/lib/bourne-shell.sh
@@ -63,18 +63,14 @@ if [ -x /usr/bin/dircolors ]; then
   _omb_util_alias ls='ls --color=auto'
   #_omb_util_alias ls='dir --color=auto'
   #_omb_util_alias vdir='vdir --color=auto'
-  _omb_util_alias grep='grep --color=auto'
-  _omb_util_alias fgrep='fgrep --color=auto'
-  _omb_util_alias egrep='egrep --color=auto'
+
+  # Note: aliases "grep", "fgrep", and "egrep" are merged in lib/grep.sh
 fi
 
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-# some more ls aliases
-_omb_util_alias ll='ls -alF'
-_omb_util_alias la='ls -A'
-_omb_util_alias l='ls -CF'
+# ls aliases are moved to "lib/directories.sh"
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
diff --git a/lib/directories.sh b/lib/directories.sh
index cd19bfccc..7be070247 100644
--- a/lib/directories.sh
+++ b/lib/directories.sh
@@ -24,7 +24,12 @@ _omb_util_alias rd='rmdir'
 _omb_util_alias d='dirs -v | head -10'
 
 # List directory contents
-_omb_util_alias lsa='ls -lah'
-_omb_util_alias l='ls -lah'
+_omb_util_alias lsa='ls -lha'
+_omb_util_alias l='ls -lha'
 _omb_util_alias ll='ls -lh'
-_omb_util_alias la='ls -lAh'
+_omb_util_alias la='ls -lhA'
+
+# From bourne-shell.sh (unused)
+#_omb_util_alias l='ls -CF'
+#_omb_util_alias ll='ls -laF'
+#_omb_util_alias la='ls -A'
diff --git a/lib/grep.sh b/lib/grep.sh
index 984e44e2c..f551ac1b4 100644
--- a/lib/grep.sh
+++ b/lib/grep.sh
@@ -24,6 +24,8 @@ fi
 # export grep settings
 if ((${#_omb_grep_options[@]} > 0)); then
   _omb_util_alias grep="grep ${_omb_grep_options[*]}"
+  _omb_util_alias grep="fgrep ${_omb_grep_options[*]}"
+  _omb_util_alias grep="egrep ${_omb_grep_options[*]}"
 fi
 
 # clean up