Designer fixes...