Beat up Fixes
Merge pull request #1178 from Fuzzysqurl/beats

Beat up Fixes