Bug Fixes (227, 230, 231, 232, 233, 234, 235, 236)