Fixes for uberspace shell