Small fixes for Cards