Fix a few possible issues with a few mechanics.