More updates to fix for atom-shell