Place and Menu instantiation fixes