Huge safe point issues

FYI