- performance fixes