Minor updates to shell