Fixes for Fists