Bug fixes

Please fix this. I will fix that.