Fixes for My Makes