Some More Bug Fixes