Release 1.0.5(5) fixes