Even More Fixes