Shell creation fixes?