Mechanic-Contributed Fixes