Tweaked key loading