Beta Fixes