Bug Fixes etc
Fixes