Many fixes IV