Merging Griatch's Fixes