Fixes For Self Zap