Fixed Plating issues

Closes #342