Fixed keycard bugs