fix a couple more jb/immutable bugs