Phantom: Design fixes