Subclass sandbox improvements.