minor performance related changes