Small imp 4 changes