NEB-3731: Tidbits

Owned by Grimfeir