More Fixes and Problems