Updates required to work with ModQ

#wip