d232 : fixes by Artifice and yinzanat