More shooting fixes