Fix keys a little more