0.4.4 fixups

Small changes targeting 0.4.4