Minor tweaks related to shooting