Minor performance turings