Few More Fixes