Various small updates for beactive