Some case confusion left over