Various bits of polish for the internal shell