Bringing over your bug fixes

Thanks for helping out.. really appreciate it!