Get in more Bug Fixes

Thanks a lot pmoosh.