More bug fixes (Release 0.102_r1)