Some performance tweeks