More Bugs fixed