Fixes

Ways things got fixed.