fixes for breaking raw pointers