Fixes from tallguy76