Beta: Minor Fixes