Some More Fixes