fixes for shell checks