[IMP] misc changes