More Fixes Again