Fixed issues with some mechanics not working corrctly with safe
destruction turned off.