Fixes for latest gunsmith changes