Autogun fixes