Preliminary Ghost Fixes