card fixes caused by cardshell issue
more keyword fixes from the cardshell break