Gun fixes