Minor Bux Fixes