Shell commands and small fixes