Small changes to Computer/ComputerCard