more imagine fixes