Fix #33, 34, 35, 36.