More Fixes and Tweaks

Fixes and tweaks to some stuff mentioned in the forums.