Wanted System Fixes