Some More Fixes/Changes