Core: Fixes in shells modules