fixes for atom-shell