[IMP-dev] Various small patches