Fixed some missed clones
Changed some clones to static versions