Issue 244

Adding some missing items for 1.8.2/1.8.3