Property map pointer upload offset + internal base instance fix