Fixed Goblet and Plate issues

Closes #206