a few more jb/immutable tweaks