More Bugs Fixes