Force the keys to be mapped, even if the system already is
Minor optimizations to arrays and intent loading - Unnoticed